Merge change 22667 into eclair

* changes:
  Fix rare NPE due to key being delivered after activity is stopped. #2062930