Merge "Add right shift handling for text controller" into devel/master