Merge "Fix binder error when an app has many channels"