Thanks for the information regarding the first one.
Disabling Smart Lock doesn't help with the lock screen. I'm using pattern, and before when I wanted to unlock the phone, I just had to swipe the pattern. Now I need to first Swipe to unlock, and then the pattern, and I don't like it.