am 2bccd31a: am f7e3bf98: am f2316a73: am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop

* commit '2bccd31abea962113ddfd0973a64f406ef54b61c':