Merge "Fix regression in launch settings performance"