Added auto-collapsing tab functionality

Change-Id: Ic8b14899ebabb4b6d833b53d2613230465880e6b