Merge "Deflake CancelFromNotificationUiTest" into rvc-dev