Merge "Remove demotion flags when a JobWorkItem is enqueued." into udc-dev