Merge "Revert "Fixes preview on home/lock tabs when wallpaper is live for both screens"" into udc-dev