Merge "Fix crash when inflating tv_pip_controls"