Merge "Fix rendering of centered caption-less images"