Merge "Revert "skip un-neccessary motion search in the first pass""