Merge "Determine indicator type for input outside of display." into main