Merge "Revert "SupportLeanbackDemos: Use Fragment#onPictureInPictureChanged()"" into nyc-dev