Merge "Wait for onPictureInPictureUiStateChanged callback" into main