Merging  ub-launcher3-qt-dev, build 5619253
am: 0ef6fe00b0

Change-Id: Ib338c01cf6355dec879ed2e7529df3b45a61409b