Merge branch upstream/master while introducing compile errors and reverting parts of Android changes, video BPP options are gone

os/emscripten/shell.html

@@ -104,6 +104,8 @@
         position: absolute;
         width: 100%;
         z-index: 2;
+        /* OpenTTD draws the cursor itself */
+        cursor: none !important;
       }
     </style>
   </head>