Merge "Merge TaskStack and ActivityStack into one class (68/n)"