Merge "Tab height and coloring" into lmp-dev