Merge "Use string notifications_disabled instead of off" into udc-dev