Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread