Merge "Avoid NPE while drag divider bar" into sc-v2-dev