Merge "Use the private version of userActivity." into gingerbread