Merge "Merge "Revert^2 "Introduce Windowless starting window."" into udc-dev am: 0b2aa295 am: 2e086486"