Merge "Fix DeadObjectException when bind fails." into klp-dev