Merge "Only wait for relevant windows when turning on the screen" into lmp-dev