Merge "Fix split divider flash if swipe again quickly" into tm-qpr-dev