Merge "Remove usage of A11y FAB bugfix flags:" into main