Merge "Adjust lock screen tests"