Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev