Merge "Stop restoring ENABLED_INPUT_METHODS"