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

Change-Id: Ia9dcbda711dbc05dd1d4d8a0c775d16f1694bb09