Merge "Catch RemoteExceptions in DataShareCallbackDelegate" into rvc-dev