Merge "Changing target sdk to Q" into ub-launcher3-qt-dev
am: 136805abdc

Change-Id: Ibe9a8ae07cccf2ad46c20c28098f3aab8cf245a7