Merge "Migrate to Material3 Switch" into main