Make partial use of saved teams

Right now saved teams can only be used in events where no specific character is required in any of the slots (unless the required character matches the saved team).  The entire saved team is blacked out (unless it is compatible with the requirement) Instead of having saved teams be entirely useless in the situation, how about allowing the user to swap in the part of the saved team corresponding to *non* required slots?   This could be shown by blacking out only the saved character in the required slot---indicating they would not be swapped in---while showing the other saved characters who would be swapped in.

As an example, I often like to bring in Okoye and Hulk as the "wingmen" for a single required character in the center spot.   It would be nice if I didn't have to do this manually each time but could instead select a team that included those two characters to swap them in.