Merge "Fix expanding PiP on TV" into rvc-dev am: 0401eb71 am: 912c3adf am: ce7952dd am: 25f468dd Change-Id: I4f44e5ee16933bf6b2c9ee7746b14a86abbe031c