Merge "SF: Fix mode setting for UDFPS with disabled AOD" into udc-qpr-dev