Merge "RESTRICT AUTOMERGE Don't run faceDetect when fp is locked out" into tm-qpr-dev