Merge "Follow-up to "Close notification panel when user button is tapped"" into nyc-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java

@@ -130,9 +130,8 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
             Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
                     getContext(), v, ContactsContract.Profile.CONTENT_URI,
                     ContactsContract.QuickContact.MODE_LARGE, null);
-            getContext().startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
             if (mQsPanel != null) {
-                mQsPanel.getHost().collapsePanels();
+                mQsPanel.getHost().startActivityDismissingKeyguard(intent);
             }
         }
     }