Merge "Actually remove settings" into ub-camera-glacier