Merge "Update configs with MAIN display type to have inputType TOUCH_SCREEN" into main