Merge "Context leaks in EditText causes out of memory"