Bug 965020 - Use task affinities more clearly to avoid some back-stack issues. r=wesj