Merge "Reattach header view after DPAD scroll."