Merge "Update comment about robotests' dummy ColorDisplayController."