am c285bd62: am ec7131ff: Merge "Lock the screen while dreaming after the...
am c285bd62: am ec7131ff: Merge "Lock the screen while dreaming after the appropriate timeout." into jb-mr1-dev
* commit 'c285bd62':
Lock the screen while dreaming after the appropriate timeout.