Merge "Fix PerformanceHints budget calculation" into main