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