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

Change-Id: I64e26f2c3f50f6b04c753fbb972e044fbbc51103