Merge "fix [3223749] media server crashes when switching mode from video capture to still image capture"