Merge "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."