Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync

1. rm-rf-mir_prompt_session_add_prompt_provider_sync
2. Dependent merge proposals