am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"

* commit '2ddfcc4ade5d6db69808a340ae54280872559ec1':
  Context leaks in EditText causes out of memory