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