am 4ba6f668: am c5bfe196: Merge "Fix screen timeout determination for starting...
am 4ba6f668: am c5bfe196: Merge "Fix screen timeout determination for starting dream." into jb-mr1-dev
* commit '4ba6f668':
Fix screen timeout determination for starting dream.