Merge "Only launch test activity once in WindowUntrustedTouchTest" into tm-dev