Merge change 27349 into eclair

* changes:
  Fix 2143297: Fix transition from password -> visible password