Caret disappears when switching VCL Styles

When the active caret is in a WPRichText and I change VCL styles, the caret disappears but is still in the WPRichText because I can type but there is no caret until I move focus away and come back to the WPRichText. Note that the caret does not disappear if in a TEdit component for example, just a WPRichText from what I can tell.

WPRichText 9.2.000

Delphi 10.4.1

To fix this issue on my end I had to process the style change completion message doing this:

procedure CMStyleChanged(var Msg: TMessage); message CM_STYLECHANGED;
...
procedure TfrmMain.CMStyleChanged(var Msg: TMessage);
var
  vActiveControl: TWinControl;
begin
  if ActiveControl is TWPRichText then
  begin
    vActiveControl := ActiveControl;
    ActiveControl := nil;
    ActiveControl := vActiveControl;
  end;
end;

Maybe that will help?