Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"