Merge "Let SoftInputWindow handle BadTokenException"
am: 680f6e802c

Change-Id: I6f9c1ff99ee9cc2157e32ebe3c0ff3faa2b6bf7f