Merge "Allow TabLayout items to be added in a layout" into mnc-ub-dev