Merge "Don't include IME in app screenshot" into oc-dev
am: 4b8f68fd52

Change-Id: If1d1b6a80748c479915ec020b5a97373bdcafda9