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

* commit 'f7e3bf981d30a2fc87076501bf33b5249684eb54':