Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev