Merge "Moving pending intent response logic to HfaLogic." into klp-dev