Merge "Revert "Deprecate getSfInstance usage in PiP component"" into tm-dev