Merge "always clear the HeadsUpDecayTimer"