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

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