Merge "Fix dismissing wrong stage when droping divider to the edge" into sc-dev