Merge "change settings to use dark theme." into ub-camera-glacier