Merge "implement proper mode color for cancel button" into ub-camera-glacier