Mir

Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/knee-jerk-mir_surface_state_automatic

lp://qastaging/~alan-griffiths/mir/knee-jerk-mir_surface_state_automatic has no merge proposals.