Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."