Merge "Avoid binder calls when unlocking" into pi-dev