Merge "Fix order of params in color display help doc" into sc-dev