Merge "Fix button is gone after dragging over 5 secs"