Merged down editor improvement made on master to feature-rowkeyboard