Merge "Merge "Fading away the lockscreen wallpaper properly" into qt-r1-dev am: ff8eaca70c am: add5ce66a1" into qt-qpr1-dev-plus-aosp
am: 80dd757598

Change-Id: I3238daba33a9619821978c106f39daf70a66fbbd