Merge "Updated expander assets from Gingerbread" into honeycomb