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

Change-Id: I26a152016d7dceb61fc333e954c17de11cffbade