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

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