7f86c806ad
- do it in onDetachedFromWindow() - make naming consistent too - update unit tests Change-Id: I320fcdbf75166bae793c4409e7344608b696667f