Merge "Default number badging off." into oc-dev