Merge "Fix testDisplayInputFlags" into main