feature #5157 add media preview on album and welcome page
fix merge conflict