Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev