Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev