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