Merge "Text selection anchors changed to use windows"