Merge "Allow Shell to change component enabled state" into nyc-dev