Merge mobile v1.5.0 fixes into master (#15703)

* Fix rich image caption toolbar and focus (#15685)

* RichText: ownProps has precedence over block context.
In this way, instances of RichText outside blocks can pass and handle their own custom onFocus and isSelected

* RichText: Remove isSelected from block edit context.

* Fix lint issues

* RichText: Revert removing isSelected from block context (#15698)

Removing it generates a regression where inserting a new list block, the block is not selected

packages/block-editor/src/components/rich-text/index.native.js

@@ -821,11 +821,18 @@ RichText.defaultProps = {
 
 const RichTextContainer = compose( [
 	withInstanceId,
-	withBlockEditContext( ( { clientId, onFocus, isSelected, onCaretVerticalPositionChange }, ownProps ) => {
+	withBlockEditContext( ( { clientId, onFocus, onCaretVerticalPositionChange, isSelected }, ownProps ) => {
+		// ownProps.onFocus and isSelected needs precedence over the block edit context
+		if ( ownProps.isSelected !== undefined ) {
+			isSelected = ownProps.isSelected;
+		}
+		if ( ownProps.onFocus !== undefined ) {
+			onFocus = ownProps.onFocus;
+		}
 		return {
-			clientId,
 			isSelected,
-			onFocus: onFocus || ownProps.onFocus,
+			clientId,
+			onFocus,
 			onCaretVerticalPositionChange,
 		};
 	} ),