Unfortunately none of that worked, tried: many reboots, cache partition wipe, safe mode.
If I look at my "Lock screen" settings ... at the "Screen lock" still says "Secured with password" - even tho' I'm opening my phone with a swipe, and opening that option pops up the well known "Confirm...