Merge "Improve visibility and layering of dock divider."