Merge "Add flag for remote streams" into sc-dev