Merging ub-launcher3-qt-dev, build 5691374
am: 5cd4333b5c

Change-Id: I1ee13fb03c133ac931197ab19918a4e55489d1c3