Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier