am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev

* commit '7f813202cb08a829b59e17be749ffee4a2f482b8':
  Get rid of preventScreenOn().