Merging ub-launcher3-qt-r1-dev, build 5691421
am: 427aa9b82c

Change-Id: I75c7f748218970294bab760486e8dcb340f7539b