Merge "Fix minimum display time issues for HUN Throttling" into main