am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock...
am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
* commit '33987528':
Fix inoperative "Forgot pattern" button when face unlock enabled