am 86e0d95d: Merge "Reattach header view after DPAD scroll."

* commit '86e0d95de1007d339af467c1484b09878ee528fc':
  Reattach header view after DPAD scroll.