Merge "Make sure we inflate custom Tab views correctly" into mnc-ub-dev