Merging ub-launcher3-qt-r1-dev, build 5736932 am: 5841e40a95
am: a3ed013179

Change-Id: I50837300184a70419f84da72adb8d0be8ef58a9c