Merge "Show media stream with remote streams" into pi-dev
am: aeb22ce3c3

Change-Id: I0dd53319f8e7ad2e0088486f272ea5eea772207a