Merge "SF: Fix unit test getColorModes() expectation"