Merge "Improve window decoration a11y" into main