Merge "Clean up activity/stack associations." into oc-dev