Merge "[pm] shell command to wait for handler(s)" into udc-dev