Merge "Fix back gesture send to wrong focus window" into tm-dev