Merge "Revert "JobQueueGroup: Improve failed-to-insert error""