Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier