Merge "fm: Set lib_running variable only on cleanup" into fm.lnx.2.1.c3-dev