Merge "fm: wait for enable event to complete" into fm.lnx.2.1-dev