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

Change-Id: Ifd7510f75c058252dc812eb1b70e699f9d4b7c89