Merge "Changing the a11y order for ringer buttons" into main