Merge "Fix round rect in divider handle"