Merge "Allow setting the Tab Indicator at runtime" into lmp-mr1-ub-dev