Merge "Setting initial state when docking task"