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