cm: Reenable disabledComponents list

Change-Id: Id845fb4676f94d7babc6380d2cd3bd5e423078b6
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0