Merge "Remove OnPreDrawListener when detached from window"