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

Change-Id: I93229aa0cd71bda25a1fcd7442447402c8c2b59c