Merge "Remove AppCompat from TouchLatency test"