Merge "Auto-clearing setError popup" into honeycomb