Merge branch 'ub-launcher3-qt-r1-dev' into ub-launcher3-qt-dev

Change-Id: If7adf6f7d151175a71ff54944970151c3510d990