Merge "Revert "unlock screen: enable DEBUG and track pattern start/cell progress."" into jb-dev