fix(baseapp): avoid header height overwrite block height (backport #20107)

fix(baseapp): avoid header height overwrite block height (backport #20107) #31703