Merge "Fix Switch colors" into mnc-ub-dev