Merge "Handle component's enablement state changes" into main