(3_5_X) Cleanup in the action handler

Cherry Pick PR #6472 into 3_5_X
**No Ticket. Just a Bug Fix**
On the iPhone idiom the UIPopoverPresentationControllerDelegate methods
are never called. So there is a memory leak and also we never decrement
the activeAlertController count. This fixes it by calling cleanup in
the action handler