Merge "Fix calculation of set of active output devices" into jb-mr1-dev