Merge "Fix flicker when releasing drag of divider"