Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev