Merge "Add feedback dialogs for WPS" into honeycomb