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