Merge "Revert "Remove getSfInstance usage from ViewRootImpl"" into tm-dev