Merge "Handle media session destroyed" into sc-dev