Merge "Changes how `am start-user` starts a profile."