Merge "Fading away the lockscreen wallpaper properly" into qt-r1-dev
am: ff8eaca70c

Change-Id: Ic45467aa192b867b825fe0abdc4e97056d527c5f