Merge "Allow control over account management of parent profile"