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

Change-Id: Ie8823e13016a4eef0c2fd93b33f953eec8f92175