Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb