Apply render callback at a slightly higher level.

Fixes non-light blocks having the render callback applied inside the Block component rather than outside.

Also moves the "Edit as HTML" form of blocks inside the render callback.

packages/block-editor/src/components/block-list/block.js

@@ -198,10 +198,6 @@ function BlockListBlock( {
 		);
 	}
 
-	if ( renderCallback ) {
-		blockEdit = renderCallback( blockEdit );
-	}
-
 	const value = {
 		clientId,
 		rootClientId,
@@ -246,6 +242,10 @@ function BlockListBlock( {
 		block = <Block.div { ...wrapperProps }>{ blockEdit }</Block.div>;
 	}
 
+	if ( renderCallback ) {
+		block = renderCallback( block );
+	}
+
 	return (
 		<BlockListBlockContext.Provider value={ memoizedValue }>
 			<BlockCrashBoundary onError={ onBlockError }>