Merge changes I8a2c5ffb,I2750695d

* changes:
  Fix live wallpaper not showing on lock screen after restore
  Workaround wallpaper restore race