Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup
Address review comments.
Replaced calls to launch(), changed method name, made wait_for explicit.
Merge pull request #12272 from bobsilverberg/bug917276

Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup