Merge "Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am: 7bd18423 am: 9c5a6e2c" into pi-dev-plus-aosp