SYSTEMUI: Prevent memory leak with Cicle Battery

Change-Id: Idf2b45ff684ccd31e9da17dc5eddfb2c5469ea70
Allow custom notification sounds to be assigned to individual contacts (part1)

Change-Id: I779350d81f3d51f7f9dc83f5ce6096945f391541