Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier