Merge "Get rid of preventScreenOn()." into jb-mr1-dev