Merge "Move hard-coded dimens to dimens.xml."