Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev