Merge "Revert "Not using reflection for all limit API"" into ub-launcher3-master