Merge "Fix getWallpaperSafeLocked" into udc-qpr-dev