Merge "Add an input feature for a spy window"