Merge "Fixed NPE when getting stack for dock divider."