Merge "Tunneled Video Playback support" into lmp-dev