am 3f696b26: Merge "Unbalanced batch edit begin and end leave TextView unresponsive"

* commit '3f696b264e4a3dd28421e9e1a58fe2c6241f48e4':
  Unbalanced batch edit begin and end leave TextView unresponsive