Merge "Do not return synthetic launcher activity for completely headless apps" into qt-qpr1-dev
am: 275b7c1d73

Change-Id: Ifd60f1aad3f77c54990b75f174f717d518e69594