Merge "Keep the screen on while the test activity is on top." into tm-dev