am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev

* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup