Merge "clearLockTask for root tasks as well at removal" into sc-dev