Merge "Make sure text selection always starts"