Merge "Only add promise icon if icon is provided in the SessionInfo." into...
Merge "Only add promise icon if icon is provided in the SessionInfo." into ub-launcher3-qt-qpr1-dev am: 505a8814
am: 3105f80e
Change-Id: Ic8d685a5f9a9f2b2ede483402d6c80e40ec9cdc4