Merge "Ignore failing test of ContrastPreferenceControllerTest" into main