Merge "Adding diags to getWidget" into ub-launcher3-rvc-dev