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

Change-Id: Ife2004942d44798afb5c7c4aabcf518bf358a6ae