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