Merge "Fix dock divider going under application windows."