Merge "Move the handling of excessive binder proxies to default handler" into main