Merge "Avoid showing previous tab when closing an app tab"