Merge "[Re-land] Deprecate getSfInstance usage in PiP component" into tm-qpr-dev