Merge IP changes over to IP_JB

Add screen on lock during test run.

Change-Id: Icbd7d41af41d2842c0fe83cfab4e86f21862e697
8 files changed