Merge "Update text color on MainSwitch" into udc-dev