Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev