am 89f5a462: Merge "More paths for turning on screen immediately." into jb-dev

* commit '89f5a4624bfa487cb5fb192d9c3c9b30937b3f26':
  More paths for turning on screen immediately.