Revert "Reduce memory leaks by removing all views."

This reverts commit a61cab784f2560d972a1c30554a697d04993c57b.

This is causing BT icon to get caught up in "all views" removal. Backing this out until Clark can look into it.

Change-Id: Ied8f45f035492ee351e6b24fa0ae88c2abfbf9ea
Merge "Revert "Reduce memory leaks by removing all views."" into cm-11.0
Merge remote branch 'cm/cm-11.0' into cm-11.0