Merge "Make sure to stop noHistory="true" activities properly" into jb-dev

Author: Christopher Tate

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

@@ -3282,7 +3282,9 @@ private final void stopActivityLocked(ActivityRecord r) {
                 requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,
                         "no-history");
             }
-        } else if (r.app != null && r.app.thread != null) {
+        }
+
+        if (r.app != null && r.app.thread != null) {
             if (mMainStack) {
                 if (mService.mFocusedActivity == r) {
                     mService.setFocusedActivityLocked(topRunningActivityLocked(null));