Merge "Use the suggested stream if it's currently active" into lmp-mr1-dev