Merge "Update Switch color to improve accessibility" into sc-dev