Merge "Fix ISE: Fragment not added in combo view" into honeycomb