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

Change-Id: I9db1b1aaa48a84bbe8fb87e1d31d9c987f6b3ed8