Merge "Remove reflection for a couple of methods" into ub-launcher3-dorval