Merge "Clean up ComponentController and fix some bugs." into sc-dev