Merge "Accessibility text contrast control" into lmp-dev