Hobbs pairing up with Shaw. Super Bowl TV Spot

I just watched the Super Bowl TV Spot from Universal Pictures and it's clear that Hobbs and Deckard Shaw are gonna be paired up to catch Dom. All of this after the prison riot. Kurt Russell clearly says "You guys are gonna work together" to both Hobbs and Shaw at 0:29 in the spot. What I find really troublesome is Shaw "working" on the same side with rest of the team/family, given the murder of Han and the strong sense of family they had with him. Working with Hobbs does not seem so troublesome, he did not have the same sense of family with Han or any of the team. His first allegiance always seemed to be the Federal government, so if an authority figure like Kurt Russell orders him to work with a criminal and former enemy like Shaw in the end he would go along with it, just like he resorted to work with a criminal and former enemy like Dom to catch Owen Shaw in FF6.

What I still can't figure out is the incarceration of Hobbs. Was he smuggled to the same prison of Shaw (like Brian to the Braga prison in FF6) to stage a riot and release him, or was he really convicted for some crime/treason?