Merge "Ensure onStop before onPictureInPictureModeChanged" into udc-dev