Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master"