Merge "Fix jumping dock divider when dismissing/maximizng."