Merging ub-launcher3-qt-r1-dev, build 5781802 am: 45d5cd2c30
am: 3deb863911

Change-Id: I4c7f4dfabd19ab8aae6dbf823e22773d8b076aa9