Merge "Substituting the app name also on the public content view" into pi-dev