Merge "Fix WindowManager boot timeout on emulators" into main