Fixed video issues on iOS
Fixed merge