FLAG_ONE_SHOT is not guaranteed to update the extras.

In contrast, according to the docs [1], FLAG_CANCEL_CURRENT is. Also
keep track of the notifications on a per-device basis.

[1]
http://developer.android.com/reference/android/app/PendingIntent.html

Change-Id: Ie04f60cde6a4332178373ce6be073e04036676c0
Settings : Re-organize menu structure

Change-Id: I7e03f1a8e1da4545d933b91c1a50e5cf72ab4ab0
Merge "FLAG_ONE_SHOT is not guaranteed to update the extras." into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2