Merge changes I28429c92,Ibb0cc4c8

* changes:
  Remove the redundant sleep after turning on the screen.
  Keep the screen on while the test activity is on top.