Merge "Fix for TabHost_TabSpecTest"