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