Merge "Removing instrumentation for unreproable bug" into ub-launcher3-rvc-dev