Merge "Revert "Introduce Windowless starting window."" into udc-dev