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

Change-Id: I43c14ec9cb3c0700cf1e3acc5b138cab135fc589