Merge "Internalize handling of a11y button click and long click" into main