Merge "Update template tile to fit worse-case dimens" into sc-dev