Merge "vkjson: Move redefinition of FALLTHROUGH_INTENDED" into main