Merge proposals dependent on lp://qastaging/~dbarth/unity-webapps-googleplus/fix-desktop-icon-name

1. fix-desktop-icon-name
2. Dependent merge proposals