Merge "Motion vector code cleanup." into experimental