am dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev

* commit 'dd7cabaec700643f551816c2b299baf8bca9a9aa':
  Only wait for relevant windows when turning on the screen