Merge "Add dynamic tab support to TabLayout" into mnc-ub-dev