Backport for 10.2.x

Alex Pottrequested to merge
issue/drupal-2561915:3168966_cke-inline-media-10.2.x into 10.2.x

Merge request reports