Add CircleMaskView to camera capture layout
Merge branch 'rework-camera-ui' into change-camera-to-cwac