Merging ub-launcher3-qt-r1-dev, build 5800211 am: 26bf127983 am: 04d97d9da3
am: 7830db8205

Change-Id: I94fd54c629a3fa5e7576ab910514430b5616e851