Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier