Merge "Avoid locking profile task when it is already lock" into sc-dev