Merge commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f' * commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f': Fix 2143297: Fix transition from password -> visible password
Merge commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f' * commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f': Fix 2143297: Fix transition from password -> visible password