Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb