am f2f29dc4: am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev

* commit 'f2f29dc4add3943eb4f0b06a5c748b99664212da':
  Don't duplicate recent tasks of the same affinity.