Merge commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb' * commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb': Fix rare NPE due to key being delivered after activity is stopped. #2062930