Merging ub-launcher3-qt-r1-dev, build 5642509
am: 5e4d53a08b

Change-Id: Ie88f1de03ad8a99d4d6b291269d16bd17736ad29