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

Change-Id: I41785fdc6363420b4ae15a9ef593eef11f295f52