User image disappears when adding a video to a posting

Setup

1. Create 2 moodle sites, one based on Moodle 3.6 (the old rendering) and one on master (with this patch applied)
2. Set up each site the same way, as follows.
3. Log in as admin
4. Create another user and a course
5. Enrol the user in the course
6. Create a course group and add an image to the group
7. Add the user to this group
8. Create a forum and enable word counts and ratings
9. Create a discussion
10. View the discussion and add a reply
11. Log in as the other user
12. View the discussion
13. Add a reply and make sure the reply contains the following:
    1. Some text
    2. Insert a video
    3. Insert an image
    4. Add an image as an attachment
    5. Add multiple non-image files as attachments

Test

1. Please test in all supported browsers
2. Log in as admin in each of the sites
3. View the discussion
4. CONFIRM that the author profile images are visible in all posts
5. CONFIRM that the group image is visible in the posts for the other user
6. CONFIRM that the rating section appears in the same row as the post actions (reply, edit, delete etc)
7. CONFIRM that the posts look pretty much the same between the new site and the old 3.6. Minor differences such as padding, profile image sizes, etc aren't a big deal.