Merge "Improve a11y ordering" into pi-dev