Merge "Ensure text contrast" into udc-dev