Merge "Add a new feature flag for new pip size spec logic" into tm-qpr-dev