Merge "Animating the shade when going back to the keyguard from shade locked" into qt-r1-dev
am: 0588aa5130

Change-Id: Iaa1aa0747b3eb0ca4947a34fe66b24859d7d4eeb