am 8f7d5cac: am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev

* commit '8f7d5cac7a78a203bb77a3086bf7b380c0c451f0':
  Align "Make passwords visible" setting.