Merge "Deflake AutoRevokeTest: wait after open settings" into rvc-dev