Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev am: 5de3e5ab36
am: 8542554d93

Change-Id: I1c3fa7d3a3e6118bc869b7046b6469ec09ce0058