Replace CircleMaskView with RoundedImageView in camera_upload
Move black color to top
Merge branch 'rework-camera-upload' into change-camera-to-cwac