Merge "Add new method to differentiate custom notifications" into udc-dev