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

Change-Id: If878a898864e06843a299a63f8985757b9602d6f