Merge "Fix: text selection bubbles move along with the text" into mnc-dev