Merge "Remove last character when pre-edit text is empty" into devel/master