Merge "Don't include IME in app screenshot" into oc-dev