Merge "[10/n] Fix a divider handle moving bug that causes it to freeze." into main