Merge "Separate text contrast preference controller from accessibility"