Merge "Fixing MainThreadInitializedObject" into main