Merge "Fix WPS to provides immediate feedback" into honeycomb