Merge "Pass through color modes in vendor range to SF" into qt-dev
am: e781a67563

Change-Id: I8a0a5efa4dc78a3f44abaffb238ce9b096cf5e9d