am 60860192: am d8bbf96a: Merge "Fix issue #6664140: Time to lock should work...
am 60860192: am d8bbf96a: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '60860192':
Fix issue #6664140: Time to lock should work even Stay awake...