Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)"