Merge "Add heuristic to better highlight block reindents"