Merge "Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of error." into sc-dev