Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev