Delete settings category if it already exists in CSettingsGroup::AddCategory()
Guard against failed memory allocation in CGUIDialogVideoBookmarks::AddBookmark()
Merge remote-tracking branch 'origin/master' into android-neon