Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev