Merge "Handle slow gesture handling" into main