Merge "Binder: Make sure binder objects do not overlap"