Merge "SF: Remove unnecessary mSidebandStream check"