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

Change-Id: I90f25768b6d82dc68dda43af8b0f0a6b29503cd9