Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev