Merge "Compare binder instead of the proxy for DisplayAreaOrganizer"