Merge "Fixed an issue where using UDFPS always dismissed the shade" into sc-v2-dev