Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java

@@ -261,6 +261,7 @@ public class V2XRoadVideoWindow extends RelativeLayout implements
 
     @Override
     public void close() {
+        simpleCoverVideoPlayer.onVideoPause();
         //移除窗体
         V2XServiceManager
                 .getMogoTopViewManager()