Merging ub-launcher3-qt-dev, build 5691374 am: 5cd4333b5c
am: 989989668c

Change-Id: I7ff68d0480e3e1e61e5ca59c9d17aba74db4c607