Merge "Revert "Revert "Close ActivityView and ActivityContainer cleanly."""