Merge "Stop leaking view during a11y sorting"