Merge "Reland "use new clearWallpaperLocked method everywhere"" into udc-qpr-dev