Merge "Only enable UDFPS display mode for optical sensors" into tm-qpr-dev