Merge "Fix key event propagation in text controller" into devel/master