Merge "Don't load app restriction from saved files in test" into tm-dev