Merge "Don't cache the ComboViewActivity"