Merge "Overhaul handling tab data updates"