CF: Signal style & notification count [2/2]

credits CM

Change-Id: I1632b6454a3fd5240179dfed34b1f332a7a37cda