Merge "CDD: Add recommendations for notification badges, and clarify how to use proprietary badging schemes" into oc-dev