Merge "Allow test to run on lockscreen" into sc-dev