Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev