Merge "Merge branch 'ub-launcher3-qt-r1-dev' into ub-launcher3-qt-dev" into ub-launcher3-qt-dev
am: 58dc1cfc61

Change-Id: I620c618124402933cb1334d0de2a46fec51c9a3c