Merge "Allow device owner to configure secondary users"