Merge "Minor fixes for devices without WallpaperService."