Merge "TabHost key handling corrected"