Merge "Let SoftInputWindow handle BadTokenException" am: 680f6e802c
am: da916d83a0

Change-Id: Id3c6ae4c997c8394517d5c75e6b2813683b56b31