Merge "Enable mode options when capture is done." into ub-camera-glacier