Merge "MSIM: Fix TabHost tag name" into LA.BF.1.1.1_rb1.17