Merge "Clean up usage of flag reset_hover_event_timer_on_action_up" into main