Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev