Merge "Add missing lock in reschedulign service restart"