Merge "Handle Context#unbindService exception" into rvc-dev