Merge "Substituting the app name also on the public content view" into pi-dev
am: 24c4759714

Change-Id: I1981cd491b3e62070a1ea52588eb4ab3821c2dfc