Merge "Animating the shade when going back to the keyguard from shade locked"...
Merge "Animating the shade when going back to the keyguard from shade locked" into qt-r1-dev am: 0588aa51
am: e5b52c33
Change-Id: Iaebe225b2c07b9e60a21d1d0243552b2d69cf623