Merge "Fix missing dock divider."