Merge "Run update note task shortcut in a service if user is different" into udc-dev