Merge "Fix GridView isHeading computation"