Move conditional that avoids reentering BUFFERING state

We guard against reentering the BUFFERING state in response to a
buffering event from the device if we're already there. Move the
conditional to where it's specifically needed (for consistency with
the CE-HTML and HTML5 modifiers).
Remove Samsung test that's now duplicated by a common test