Merge "Avoid blocking outgoing binder call for setQueue"