Merge proposals dependent on lp://qastaging/~unity-2d-team/unity-2d/corruption-in-spread-in-metacity

1. corruption-in-spread-in-metacity
2. Dependent merge proposals