Merge "Fix unregister after delayed register" into sc-qpr1-dev