Merge "Merge "Fading away the lockscreen wallpaper properly" into qt-r1-dev am: ff8eaca7 am: add5ce66" into qt-qpr1-dev-plus-aosp