Merge "PrettyFormatter: Fix expand tab when syntax coloring is on." into stable-2.6