Merge "Ignore 16K kernel modules when running on 4K kernel" into main