Actually disable the "make album cover" option when the item is already the album cover.  Fixes #1979.
Merge branch 'master' of github.com:gallery/gallery3