Merge "Make sure OutOfMemoryError is handled by WallpaperManager"