Merge "Merging ub-launcher3-qt-r1-dev, build 5749827 am: 3fc9a1cf69 am: 33e8612e8c" into qt-qpr1-dev-plus-aosp
am: 760edb9905

Change-Id: I248bab5497d8271cee233b0572833142bb57b6ea