Merge "Updated text_select handles Bug: 5076695"