Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev