Merge "Fix effect and mono sink handling." into lmp-dev