Merge "Fix tapping on divider bar several times makes split sloggish" into sc-dev