Merge proposals dependent on lp://qastaging/~afrantzis/unity-system-compositor/dbus-active-outputs-for-mir-0.25

1. dbus-active-outputs-for-mir-0.25
2. Dependent merge proposals