Revert^2 "Wait for LauncherModel loaded in waitForLauncherInitialized"

This reverts commit b80c6c347a6c3c425bcb317bfba3c3f789db8fd1.

Reason for revert: The original change was not the cause for the test failures

Change-Id: Icfe0da43a96f5471076554c4dd25eae649bee81e
3 files changed