Merge "Fix bug 4818050 - Need a way to get notified when a PopupMenu gets dismissed/canceled"