Merging from ub-launcher3-qt-future-dev @ build 6099678

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-qt-future-dev_6099678.html

Change-Id: I205e6a8dc0042dd69d62c319c170b4bbed378c75