Merge "Fix for issue 3495914: (In Java) Video clip switches between start and end"