Merge "Reset Preedit variables in 'Delete All' state" into devel/master