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

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

Change-Id: I619b51952d3d8577b9929d81ca3ce2ca8cc2fac9
Merged-In: Ied2409b3978f5f0429bd05a9f2c855f46a5f0bfc