Merge "Added test to verify activity can turn on screen." into nyc-dev