Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855' * commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855': Make sure OutOfMemoryError is handled by WallpaperManager
Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855' * commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855': Make sure OutOfMemoryError is handled by WallpaperManager