Merge \"Don\'t overwrite pref\'s backgrounds\" into nyc-support-24.1-dev
am: 4a69b142e2

Change-Id: I2b80a13a34be9c5b341905f96dc2a29b9cf638ee