Merging ub-launcher3-qt-r1-dev, build 5781802
am: 45d5cd2c30

Change-Id: I0f71ade0b62b2f3e83d1817d37d916b8376c688d