Merge "fs_mgr: Remove deprecated mount option" into main