[z1828] fix the issue that HomeMovementGenerator finalize code wasn't executed in real meaning

(based on commit da2a09a)

(cleaned version of ccd365e)

(based on commit [s1386] - be6ab9a)