Bug: 12034934 Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
Also, sync to latest version of WallpaperCropActivity Bug: 10950237