Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev am: cf5514257f
am: 34878a27d7

Change-Id: If16150ea0b95a1cb40a0af184ca22a08892d3988