Merge "Bug fixes in Text selection." into gingerbread