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

Change-Id: Ibc6b82c678afd95fe9485a9e5572a7cf27ff3f0f