Merge "Update to use MaterialSwitch" into main