Merge "Fix crash when device doesn't support picture-in-picture" into nyc-dev