Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb