Merge proposals dependent on lp://qastaging/~justinmcp/unity-webapps-facebookmessenger/app-name-fix

1. app-name-fix
2. Dependent merge proposals