Merge "Disable password bouncer cursor when testing" into main