Merge "Minimize amount of time blocking inbound shortcut binder call during I/O" into main