Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev

services/java/com/android/server/am/ActivityManagerService.java

@@ -2298,6 +2298,7 @@ public final class ActivityManagerService  extends ActivityManagerNative
         intent.setComponent(mTopComponent);
         if (mFactoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) {
             intent.addCategory(Intent.CATEGORY_HOME);
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
         }
         ActivityInfo aInfo =
             resolveActivityInfo(intent, STOCK_PM_FLAGS, userId);