Samsung FRP lock - Android 5.1 have access to Settings

Honestly... I'm not 100% but here goes....

After fiddling around, flashing a custom bootloader (which got blocked due to FRP lock) I reflashed 5.1 stock ROM and did the camera trick for the 3rd time, however I got boot loops and so the phone started up in Safe Mode.

I then restarted the phone to get out of Safe Mode and the FRP Lock was disabled. I had done nothing different except that the phone booted itself into Safe Mode. After Safe Mode and normal reboot, Settings/Build Number taps worked fine whereas it previously hadn't. I believe Safe Mode to be the crucial step to disable FRP Lock/Google verification.... Now need someone to verify.

Manual way here:

• Power off the device.




• Press and hold the Power key for one or two seconds to turn on the
  device.




• When the Samsung logo displays, press and hold the Volume down key
  until the lock screen displays. When the Lock screen is displayed,
  Safe mode is displayed in the lower-left corner of the screen. To
  exit Safe mode, restart your device.

TLDR; FRP Lock/Google verify > Boot into Safe Mode, then reboot again into normal mode > FRP Lock gone?

The only extra step was that it rebooted into Safe Mode from a privileged state, e.g. I had a lockscreen setup.