Merge "Only remove task if activity fails to start." into oc-dev

            // If we are not able to proceed, disassociate the activity from the task. Leaving an

            // activity in an incomplete state can lead to issues, such as performing operations

            // without a window container.

            if (result != START_SUCCESS && mStartActivity.getTask() != null) {

            if (result < START_SUCCESS && mStartActivity.getTask() != null) {

                mStartActivity.getTask().removeActivity(mStartActivity);

            }

            mService.mWindowManager.continueSurfaceLayout();