Merge "Fix crash in presentation time implementation" into main