Merge "Improve window caption a11y" into main