Merge "Catch IAE from unbind onServiceDisconnected()"