Merge "Fix blurry wallpaper when user locks on all apps surface" into tm-qpr-dev