Merge "Remove the extra parameters in onCommitNotComposited" into main