Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev