Merge "Clarify the behaviour of isActivePasswordSufficient"