Merge "Don't overwrite pref's backgrounds" into nyc-support-24.1-dev