Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev am: 9141666630 am: 9ff115c3c5
am: 5065068d3f
Change-Id: Iad7db69e78c913882e65713fc527c904700b322b
This commit is contained in: