Merge "Revert "Delay handler messages until class is fully initialized"" into main