Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2