cm: Reenable disabledComponents list

Change-Id: Id845fb4676f94d7babc6380d2cd3bd5e423078b6
cm: Enable notification counters

Change-Id: I6e586bd3e32005df359faae95532c1ce4ac4bd97
Merge branch 'remote' into mkl