Merging ub-launcher3-qt-dev, build 5642962 am: 0ea61abe10 am: 0843bc1f77
am: 9d93d1c87b

Change-Id: I75b4d5bcd13dba8ac237df63e0ee1a8767f29ed0