Merge "Having longer period of waiting for Launcher restart only in Launcher test suites" into main