Merging ub-launcher3-qt-r1-dev, build 5759495
am: 77db8d0669

Change-Id: If0443056c7f25b538de74067c0901708606be2c4