Merge "Add config to fine tune emergency gesture min time" into tm-dev