Merge "restore all tabs on demand"