Default [Q] want swipe lockscreen when tablet wakes

My Tab 4 is password-protected with a 30-minute delay. But when the tablet wakes, I'd like it to always go to the lock screen, in order to protect against waking accidentally if the tablet gets jostled in its carrier. The lock screen should just require a swipe, unless 30 minutes have elapsed since last use.

That's the way it works by default on my Android phone, but I can't find any setting to make my Tab 4 work that way. Instead, if it's been less than 30 minutes, the tablet wakes directly to the home screen, or whatever screen was last in use (after 30 minutes, I get the lock screen with password, which is appropriate).

Is there any way to get the desired lock-screen behavior on the Tab 4?