Merge "Check media session token type" into sc-v2-dev