Degrade isList to maybe for optional non-list keys in array shapes and shape merges
#18794
| Job | Run time |
|---|---|
| 2m 9s | |
| 2m 15s | |
| 2m 9s | |
| 2m 11s | |
| 2m 31s | |
| 11m 15s |