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

* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup