Merge "Creating a common class for loading drawables and handling various badging" into oc-dev