Merge "Restore gray coloring for autocomments"