Merge "A11y changes for notification controller of switch" into main