Merge "Change the order of preferences in a11y"