Merge "Guard onPictureInPictureUiStateChanged with WM lock" into main