Merge "Remove combo view on new intent" into honeycomb