Merge "Add a few TODOs for removing getSfInstance" into tm-dev