Merge "Revert "SF: Encapsulate frame targeting"" into udc-qpr-dev