Merge "Default setup wizard to use PIN"