Merge "Fix bounds calculation in TV PipController"