Merge "Make sure to cleanup views that couldn't be added" into tm-qpr-dev

            try {

                root.setView(view, wparams, panelParentView, userId);

            } catch (RuntimeException e) {

                final int viewIndex = findViewLocked(view, false);

                // BadTokenException or InvalidDisplayException, clean up.

                if (index >= 0) {

                    removeViewLocked(index, true);

                if (viewIndex >= 0) {

                    removeViewLocked(viewIndex, true);

                }

                throw e;

            }