Merging from ub-launcher3-qt-qpr1-dev @ build 5834630

Test: manual, presubmit on the source branch
http://x20/teams/android-sysui/merge/ub-launcher3-qt-qpr1-dev_5834630.html

Change-Id: I39968f831d707800207303e7661193fd74e56124