Merge "Account for runtime component enabled state to check if OEM UI is enabled." into main