Merge "Prioritize INPUT_PROP_DIRECT first."