Fix empty image folder removal for legacy locations Original-merge: 476dc01f4d Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Joshua M. Boniface <joshua@boniface.me>
476dc01f4d