Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev