Merge "fm: Update FM state as part of reset"