Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b
am: eb63919bc4

Change-Id: Ie035bcafa71e4b8d2e2e839212b001dc4c1d00f7