Merge "Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field"