Merge "Fix tv.PipController constructor"