Merge "Refactor all lock task related methods into a new class"