Merge "[Re-land] Remove getSfInstance usage from ViewRootImpl" into tm-qpr-dev