Merge "Reduce jittering while dragging divider bar" into tm-dev