Merging ub-launcher3-qt-r1-dev, build 5766606
am: 8822dc0018

Change-Id: I41d122efe5cefb14c56c0bcad046aae627037311