Merge "DSDA: Set call EXTRA if either sub doesn't allow hold" into main