Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407 am: 1e28182362
am: e74728b586
* commit 'e74728b5863e3670d2ffd755d171dc37c6e6cd39':
Change-Id: I8e14fd4427a7006267d55e6853fbababafe01a65
This commit is contained in: