Merge "SF: Fix unit test getColorModes() expectation" into pi-dev