Merge "Fix the lock task cts test." into lmp-sprout-dev