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

* commit '6c1ef468d480520f706efe3264c5da48238f878d':
  Avoid porting null keys when copying preferences into new system