Merge "Revert to previous text selection behavior" into froyo