Merge "Always wait for session end in PrinterDiscoverySessionLifecycleTest" into rvc-dev