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

This reverts commit 381faaba87ebc6c743b3a3ef46d8b5d3b27e05ec.