Merge "AIOOB exception fix in TabWidget"