Merge "Fix password toggle taking FOCUS_DOWN events" into nyc-support-25.1-dev