Attempt at fixing the IME toggle not working properly

Change-Id: I04c32743dcfba5e2c92cc79b9dcbad3efc56b553
Merge "Attempt at fixing the IME toggle not working properly" into jb42