Heads Up [1/2]

PS2: HeadsUp: Clean up.
Change-Id: I98f445e7a4c92a34a3d9f63e14135e92416875ff

PS3: Get this going for AOKP