Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-qpr1-dev