Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev