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

Change-Id: Ibdc405a526c82fbfa3dab0e09a9a973202f71a82