Merge "Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala)" into ub-camera-haleakala