Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into udc-dev