Merge "Update "make password visible" preference string"