Merge "Update TabLayout demo to use new APIs" into lmp-mr1-ub-dev