Merge "Dismiss overlay if there's no activity in other containers" into main