Merge "Clean-up component states in AMS when component is disabled" into mnc-dev