Revert "Revert "TabIndicator""

This reverts commit 335976b8c2fb8a8f4de846449be143e66c0cb01d.