Merge "WM: Clean up InputTarget interface"