Merge "Revert "Remove gray line""