Improve jank on header change.

Also fix expand icon ripple.

Bug: 30070005
Change-Id: I0a139778f14d5ba4ebee6e27a321af3827ecbe96
2 files changed