Merge change 25388 into eclair

* changes:
  Fix #1827299: Google login screen to re-enter password is not viewable