Merge "Derive GridLayout's 'gap' constants from new "default_gap" entry in dimens.xml."