Merge
Fixes: U4-4477 Media picker doesn't show thumbnail any more
Minor addition to the U4-4477 fix