Merging  ub-launcher3-qt-dev, build 5528135
am: 4c8e5dd275

Change-Id: Ic9ece52afbf3b61453a17bc4f85f79093622852c