Hi guys i just had this update and i find the easiest way to sort out this annoying screen lock is to follow these simple steps on your samsung s6 flat
step 1: Go to settings
step 2: To to Lock screen and security
step 3: Scroll down to Other security settings
step 4: Scroll down other settings...