Merge "Clean up [identity-feature-enable] options for old releases"