Merge "fs_mgr: fix potential uses of nullptr"