Merge "Fix bug #3388534 Long file names are improperly displayed when played"