Merge "Add multiple components support for component enabled setting updates"