am 890ab9be: Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier

* commit '890ab9beb8642bc9278f9914013be2fd65d740f8':
  Refine in-place conversion semantics for Settings