I've been going nuts trying to figure this out because I had it fixed once before but I reset my phone.
Under security settings, enable "Power button shows lock screen." This will bypass the initial swipe screen. If you use Smart Lock, enabling this will change your lock screen to the generic...