Merge "Removing unused method isAvd" into ub-launcher3-qt-qpr1-dev