Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX"