Merge "Revert "Corrected flow for accessibility."" into qt-dev