Merge "Fix password policy handling in temporary password provider"