Merge "Temporarily fix directory tile heights in grid mode."