Merge "Converting IconShape to mainThreadInitializedObject instead of keeping it a process static" into main