Merge "Move the Tab Indicator higher up the draw call stack" into lmp-mr1-ub-dev