* Fix namespaces and optimize imports * Cleanup fixes * Merge conflict fixes * Merge conflict fixes * Merge conflict fixes
Fixes state handling code on components to not throw exceptions when called with null components.