Merge "Fix video call from search stripping + prefix"