Merge "Workaround wallpaper restore race" into nyc-mr2-dev
am: 29e3920c4e

Change-Id: Ida5a953e75c326a1b5f555c820d807e7cb91b797