Bug 921424 - Replace wait for landing page after unlocking with wait for displayed app to be homescreen

Uplift to v1.2