Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev am: 1c0601b046 am: 438167c61d
am: e57a428d5d
Change-Id: Iac9c7e2dfbd8a1728c11e4df5d440921cdf200c5
This commit is contained in: