Merge "fs_mgr: overlay drop redundant check"