Merge "Added flags for new A11y APIs for scroll amount and collection counts" into main