Merge "Fix SecondaryLauncher crash when started." into ub-launcher3-qt-dev
am: 4736b17a99

Change-Id: Idecbee777120bae16b9b15b13d882d704fdfebad