Merge "Fixes around text selection"