Merge "Only dispatch onPipUiStateChanged when it's not finishing" into main