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

Change-Id: I9c04ab6edeba42ef28e962ecac8cc9fea18257d9