Merge change 25640 into eclair

* changes:
  Make the EditText error popup correctly resize when the view resizes.