Merge "Fix screen timeout determination for starting dream." into jb-mr1-dev