Merge "Don't recreate touch controllers when ending gesture" into sc-v2-dev