am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev

* commit '2a32771ace5250ec919a08da688e2d6c91e5c132':
  Fix Text appears on top of existing text when composing in gmail.