Merge "Remove cancel listeners from pending intent alarms"