Merge "Handle hiding timer reset on every move."