Merge "Fix UDFPS not working when a HUN is showing" into sc-v2-dev