So the trickster has been Gabriel all along?

So this season they are making friends (ie the little boy, Gabriel) that are all gonna come together in the end and help them kill Lucifer?

Love it!