Fix removing of empty film rolls

(cherry picked from commit 8b0c7f2a4b32a14ac0ad5cb15eaa797920a275f2)