Merge "System Router: Don't filter by individual prefs" into tm-dev