Merge "Only mark unhandled events as handled when an action was made" into main