Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()""