Merge "Don't change keyboard state in setIconifiedByDefault."