Merge "Fix expanding PiP on TV" into rvc-dev am: 0401eb71 am: 4f574d01 am: 680244fc am: 0e9a17c0 Change-Id: Iabd70336251a4af0f95f319a012cfcdda0f70eaf