Merge "Fix activity icon badging for non-bitmap icons" into oc-dev