Merging ub-launcher3-qt-r1-dev, build 5759495 am: 77db8d0669
am: 24ae37ca15

Change-Id: I580b265a51692c4c2291ebfd8c6bd7a1e40a86b3