Merge "mediaplayer: handle surface dis/connection errors" into lmp-dev