Merge "Improve motion search in real-time mode"