Merge "Copy user info from PackageSetting as well" into honeycomb