Merge "Creating a common class for loading drawables and handling various...
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev am: 15b48ff4
am: cdb51ebb
Change-Id: If4ee1ff513c4f52b102a9252c99e813d783f6d1d