Merge "Prevent crash if detachWallpaperLocked is called multiple times" into udc-dev