am 966c15af: am 3f502de8: Make party shuffle use the history too, making it less random, but more like users expect. http://b/2535828

Merge commit '966c15afbf27e2cdbaee0b800d65d5ea403ddb22'

* commit '966c15afbf27e2cdbaee0b800d65d5ea403ddb22':
  Make party shuffle use the history too, making it less random, but more like