Merge "Allow single inactive layers to be cached if they would be used for a hole punch."