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

* commit 'acefecbff3141b43dc55fe18146cf842d1d4a8ae':
  Updating promise icon's bitmap and label when onBadgingChanged is received