Merge "Ensure Contrast: Address API feedback" into qt-dev