Merge "Cleans up DefaultAppShortcutPreferenceControllerBaseTest.java"