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

* commit '180b89d1ee5a461a68384ee3a68467e591bdbc00':
  Move the Tab Indicator higher up the draw call stack