Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev