Merge "Reset launcher on shortcutconfig activity minimize" into ub-launcher3-master

    @Override

    public void startActivityForResult(Intent intent, int requestCode, Bundle options) {

        if (requestCode != -1) {

            mPendingActivityRequestCode = -1;

            mPendingActivityRequestCode = requestCode;

            StartActivityParams params = new StartActivityParams(this, requestCode);

            params.intent = intent;

            params.options = options;