Merge "Create primary profile file together with app data folders" into nyc-dev