Merge "Change the wait time of setDefaultLauncher from 20s to 60s"