am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming...
am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev
* commit 'ec799e88':
More on #7296510 Transition from lock screen to dreaming is really bad