Merge "Allow changing signing cert for system apps that use shared users"