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

Change-Id: Icb15885a9ffb763dac1acf4db4685b3c8dcb5ac5