Merge "Clean up WindowInsets API for release" into klp-modular-dev