Merge "Add queries for surface color space support"