Merge "Fix an issue wherre error notification will not be sent after mediaplayer reset"