Merge "Reuse log IDs when a GestureState is being reused" into tm-qpr-dev