Merge "Make isUsingUnifiedPassword throw when used on parent instance"