Merge "fs_mgr: allow FDE options in recovery mode"