Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev

    public void onClick(DialogInterface dialog, int which) {

        UserHandle user = mSelectedTile.userHandle.get(which);

        // Show menu on top level items.

        mSelectedTile.intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);

        mSelectedTile.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);

        getActivity().startActivityAsUser(mSelectedTile.intent, user);

        ((SettingsDrawerActivity) getActivity()).onProfileTileOpen();

    }

    public static void updateUserHandlesIfNeeded(Context context, Tile tile) {