Merge "Motion vectors code cleanup." into experimental