The merge of #30784 has broken the accessibility changes made in #30823
A quick look is that the PR has reverted the changes made to the layouts - annoyed
@carcam please check
Please test #31576
@carcam please check