Merging ub-launcher3-qt-r1-dev, build 5800211
am: 26bf127983

Change-Id: I1b57843c3d753f7441b2a6cb707106cc9c8414b3