Merge "Clear input routing when closeAllInputs()." into pi-dev am: 2383098d54
am: 42a6dd5492

Change-Id: I543aeaaafc3b6df3cc04995bcf433c724c093655