Merge "More paths for turning on screen immediately." into jb-dev