Merge "Reduce memory leaks by removing all views."