Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev