Merge "Parameterize dimens (1/2)" into main