Android is ignoring my choice of lock screen
Solved it! The problem was that when I connected my Samsung Gear Fit to my phone via bluetooth the phone was told to bypass lockscreen. The solution was to go to Settings > Security > Trusted Agents and then turn Smart Lock off :)