Merge "Support vendor color modes for sf mode sysprop" into qt-dev am: abc726ec50
am: aa1e335fa3

Change-Id: I601ab946d98dc2c916b63394696cfc580bb1d5e3