Merge "Fix crash with AppComponentFactory"