Merge "Update the margins and colors of MainSwitchBar to fit the spec." into sc-dev