Merge "Use direct callback instead of pending intent for time-out alarm"