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

Change-Id: I44b214a46e8a6510353f15d997a17e137cddf5e9