Merge "Refresh overlay on new snapshot taken even if an old snapshot exists" into main