Merge "Fix a crash when setting lock pattern in SUW"