Merge "Use PipMediaController in .tv.PipController"