ScreenShot Update #2

Cleanup tabs also

Change-Id: I7a249003afbe56f092d6447df275e84ce4d61da5