Merge "Add streamType check for intent extras" into main