Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev