Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier