A small refactorin of launcher mainloop

Change-Id: I447dc29db6e16b329bf52ef7863eed3a8d200971
Signed-off-by: TanelDettenborn <tanel.dettenborn@gmail.com>
Merge "A small refactorin of launcher mainloop"