Merge "Provide synchronization to setview to avoid NPE"

            mViews.add(view);

            mRoots.add(root);

            mParams.add(wparams);

        }

            // do this last because it fires off messages to start doing things

            try {

                root.setView(view, wparams, panelParentView);

            } catch (RuntimeException e) {

                // BadTokenException or InvalidDisplayException, clean up.

            synchronized (mLock) {

                final int index = findViewLocked(view, false);

                if (index >= 0) {

                    removeViewLocked(index, true);

                }

            }

                throw e;

            }

        }

    }

    public void updateViewLayout(View view, ViewGroup.LayoutParams params) {

        if (view == null) {