Merge changes If18f6539,I37018926 into main

* changes:
  Simplify adding FLAG_IS_GENERATED_GESTURE in GestureConverter
  Don't affect window focus on touchpad gesture