Merge "Fixed a bug where the header would flicker weirdly when replying" into nyc-mr1-dev