Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev