Merge "Don't throw when userActivity fails because of the permission check." into gingerbread