Merge "(bug 40610) Prevent editing textarea from overflowing out of bodyContent"