Merge "Revert "Make starting window hw-accelerated"" into lmp-dev