Framework and SystemUI: Refactor CM Additions resources

Change-Id: I14838aad7ef21f852cfc381f55ac8a14369d02c4