am 7eeb897b: Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier

* commit '7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37':
  Catch exceptions in settings remove helpers