Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb