Merge \"Improve jank on header change.\" into nyc-mr1-dev
am: 7ac1886ae9

Change-Id: I4c57aff5f779998f4bf8b79c74692a2e7f764ac8