Merge "Updated text cursor assets" into honeycomb-mr1