Merge "Fix direct/offload thread output devices into MSD"