Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev