Merge "Don't reregister AoD UDFPS gesture after trigger" into tm-d1-dev