Merge "Skip cross-task or back-to-home if current task is locked." into main