Merge "Fix simulator preset"