Merge "Handle controlInputMethodAnim correctly when IME isn't ready"