Merge commit 'd9ec29f64827bc703a23b1c33d653906a91713fc' into eclair-mr2-plus-aosp * commit 'd9ec29f64827bc703a23b1c33d653906a91713fc': fix text area insertion order, partially
Merge commit 'd9ec29f64827bc703a23b1c33d653906a91713fc' into eclair-mr2-plus-aosp * commit 'd9ec29f64827bc703a23b1c33d653906a91713fc': fix text area insertion order, partially