Merge commit '3d4b7065' * commit '3d4b7065': Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly