Merge "Don't mock out TaskRecord & ActivityStack during test (56/n)"