Merge proposals dependent on lp://qastaging/~andreas-pokorny/mir/add-display-configuration-output-assembly-to-display-device

1. add-display-configuration-output-assembly-to-display-device
2. Dependent merge proposals