Merge "Tweak the way to get the enabled component" into sc-v2-dev