Merge "All a11y actions on lock icon should go to the bouncer" into main