Merge proposals dependent on lp://qastaging/~uriboni/unity-2d/metacity-capture-before-unmap-not-default

1. metacity-capture-before-unmap-not-default
2. Dependent merge proposals