Merge "onWindowDismissed API cleanup" into klp-modular-dev