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

Change-Id: Ie270368968168271600f9d02d11fd20033484fb2