Merging ub-launcher3-qt-r1-dev, build 5766606 am: 8822dc0018 am: 7a495fdfa1
am: 691007f721

Change-Id: I7b8129c3fdf40e03828da640b2a1680f1c2a8883